Re-added FA, minor change
Fixed preview fitting