completing callback handler improvmentz