this changes are good, but can you put it in another PR? :)