addressed git issues 136,144,177