Seriously this would be so much better