updated taps, updated gemlock