Improve gemlock