modified for new teefaa