Adjusted to my personal preferences