fixed up for new manager api