some modifications to 2.0