Requested changes, tests passing