New version completed

Resolve done
DI still missing