Updated with cool shortcut idea I found