added misc from 7.22