callbacks improvements begin