Revised through sec 5