Changes according to documentation