more cmpFS refactoring