update for new dependency structure