changed dependency order