moar adjustments to callback