deal with rail's review comments