new code as of 8/21