modified InHandler