editing 058a
finalized merge