Merged changes from home and work