Implement new logic for passing