Update stuff based on docs