Adjust to standards