rebuild with shorthands