Input Handler mostly restored