Modified to my liking