ENH: Better flow of changes