updated stuffs