Changed CheckSender logic