codePro changes. left some that delt with observer