Final Class Changes