Modified some basic stuffs