Made some fields final. Added BitSet eventSet for clash detection. Used eventSet in acquire and surrender.