Closes #213, reduced spawn in ToS 2f