Managed to finally get a better time. As always, more work to be done to improve!