Some Changes to Stuffs