Changed to link lists and more