Revamp for Fedora