cosmetic changes
merge changes from home and work