updating code for standards, one more time