Replacing CGIs from previous commit by one more sofisticated.