added <> specifiers to constructor calls