KAZOO-1863 changes suggested