Our changes

Signed-off-by: Fran <fran@touristeye.com>