Editing around, still not sure whether this will work in the end