Added Editing Stage 2 still has bugs