Final class update