add final class stuff