Troy's changes

First candidate for submission