Updated checks and callbacks