Continue todo... Special commit for Dimou
Resolving Conflict