Adjust code for serengeti 2.0.