New code, finally it works :)