adding defns back in