changes to match what is in qar repository