restructure.callbacks and validation fixed.