added some copy and renamed class w/ uppercases