updated short cuts