changes from work
merge work and home code