Removed code duplication: (if macro? ... only done once now.