Implemented RJL suggested changes