Implemented Changes from 6/4 meeting w/ Robert