Making further changes thanks to @xabbuh