Configs simplified, fish added.