A few tweaks by Jonathan