changes to syntax
merging commits