Further refinements

Current record is something like 4000