Adjusted to list format