Improved some shit