Improve class 1