added changes to the common code