I am working on a edited version