Changes to standardize callback.