Commented and changed list to be correct