Similar improvements to those done to the list system are done here as well.