Have a look at my update, hope that's okay.