Removed old functionality
Added new F2.1 functionality
Added new F2.1 functionality