clean up with new add to list function