#36 refactoring after consultation with Tom and Michael