revert adding options to callback - breaks too much code