Slight reorganization in examples, callback change