Made some ch-ch-ch-changes