Changed important stuffs