change to check stop id