Rebased into one clean commit