Updated with Tommy suggestions