Made the advice section a bit more robust.