Replaced callback chain to be more standard