Minor update of old code