Not happy with the code for list still