[DEV] change the input and entry event function