20080519 edit-page: Speeding things up