First version after transforming the whole thing