local changes
merged home and work
minor es change