new updates..not finished yet