RHEL working
Merge with Chris' changes