made some changes to list, potentially boringified it a bit