some correction after restoring the functional interface of methods.