Removed some final keywords to help with testing