3º & last part of my commit now its all and works