Editted

See last commit message for more information