changes to work with latest tattletale version