fixed up short cuts