Final Class Update