Updated to the Spiwack's tactics