No need for these shenanigans anymore either