Find commuter and some safety checks added