both classes altered for easier work