case list and situation list ready
fixing ugly merge conflict :S