Changed setup to list