Integrated new tank model - works well except for update issue