Made better in various ways