Same as before
Fixed merge conflicts