changes to be compatible with 1.0