added some more basic stuffs