Refactoring to match FM