working with master, all tests passing