tweaked some stuffs