Tweaked to my liking