Add changes to class 1
Apply changes suggested by @davidmichaelbrown