Unstable - addresses #6