final updates
merging in new changes