replaced message interception to Input class,