Redid work after git cock-up