Allow correcting stuff
Refactor