changes for personal username
extras from ppinette branch
parker branch is master