added stuffs ja!