Finally, should have happened sooner