testing merge with davids code