Documentation and some signatures changed because, confusing.