Made changes to pass certification