Changed last hardcoded column numbers