Yet another massive update after noop fix