Merge with original Tshock