Some inprovments