Changed to a simpler data structure.