* Yet another improvements instead of a complete redo Co-authored-by: luk3yx <luk3yx@users.noreply.github.com>
Co-authored-by: Maksim <Maksym48@pm.me>