minor changes and added stop id