merged some stuff from work-init into home-init