minor changes of handler