edited version up