Updated CI again to improve shortcut