Updated tank and entities