continued to refactor to support Fedora 4 beta 4 changes