Correct the glass
Fix the inheritence