added some new stuffs