solved all isues