Some crucial changes