added user cases
changed class names