Still tons to improve on