Changed a little stuffs