Updated List, and removed compilation errors