merged changes from home laptop to bash files