Updating to pass all compliance tests