Updated some stuffs