added shorthand stuff