dan modifications, 1
merged git