database optimised and tests all still passing