Updated to use the new F2 refactored method