Updated to my liking