1st Demo Modify Bug