Removed final from class