Made this hella much better