A better version of my 1 am edit