more lightweight changes to sec 5