current code as of 6/24