Updated with my own preferences