Oh yes, this is SO much better...