changed constructor template to remove TODO