Adapted to my liking