Changed importnatn things