dameyer commit on develop a & b 10:08