made changes to compile against 2.0.0