Moved and revised class 1