Modify and update to make galaxy compliant