Slight refactor of soyuz.