changes to 2.0 code