Sly: in the same commit, please. with a nice commit log to boot :)