still not working completly