Little changes waiting for gfestari implementation of Shield ;D
A little change