Fixed the references
Merged updates from home and work