This would be so much better