fix params and etc ...