modify case to fit v2.1 changes