stop-and-wair: minor modification
1. cleaner coding
2. REQ type added