changed dependency structure