pushing these changes from laptop to desktop 11_22_2014