modify common code