Additional changes, made more clear