updated for my personal preferences