Updated to reflect my preferences