changed schema to be faster, smaller