Both of them in one single commit :)