Modification for Release1.0 update