Change necessary things from 8bf034e8c47d40d8bd1c89f2185f6eb7db2c202d