Fixing up Contracts - Callback