we fixed all those point