some great changes

Signed-off-by: asr245 <andresj.soria@tic.alten.es>