attempting to shuffle some DI fields