Updated with my preferences