cleanup
merging changes from work machine