Added gemlock change