updates for consistency pointed out by Henry