tweaks as per shauns review