Updates based on Greg's comments 1
Updates from Greg's comments and versioning errors fix