Yep. This is SO much better!