Added comments in order to fix synchro issues.
Comments with ///DIEGO/// are marked as cause of errors and need to be fixed.