edited version2