Updated with my personal preferences