Modification for veriosn 2.0