further working on fabric refactoring