consolidated work from 3-21