refactored lfa-project