Changes remaining issue #52