Added new F2.4 functionality