Updated version with lists