Refactored fikes