MILESTONE: rhel-6 working