resume update from dave and first flip commit