Need to test the output until the edited point
Uncommented some more lines