flandmark refactored