keeping code consistent in sync with develop