Reworking all of the list