KAZOO-2753: work on spec