Changed columns from 12 to 24