Improving my shortcut takes a while XD