new shortcuts for build system
merged