Added list back to logic