Modified and add some parameter passed to init