Improved my time a bit!