Added stuffs(I can't exactly remember)