Made some improvement