improvements on special case section