More tweaks, nearly there...