#0016 removed all callbacks, replaced with return values