Updated to use the new F2 refactoring method