changes for php at work
merge work and home