Last changes

It doesn't have any kind of control of errors yet