TODO corrections to do