Pilots2 refactoring.