New API for callbacks
Fix for invalid start conditions