Class Final Changes

Class Final Changes