Updated with tank models