More updated changes