Got rid of last year's flag & arm stuff