Updated but not all working