Tweaked some stuffs