improved 13 seconds, although there's still room for a second or two improvement