still Almost working