add additional handling to old assumptions