Finished update from comments given on aug 29