Needed a few changes! Enjoy!