Adjusted to my liking