EoD commit
merged functionally identical code