refactored fiteagled