New move flag/class fix