Should have been like this right after rebasing