REM: dead code
REM: unnecessary casts
ADD: a lot of Override annotations
ADD: some Override annotations
ADD: some Override annotations
REM: some else statements
REM: dead code
ADD: some Override annotations
ADD: some Override annotations