user-result improved, classes added