Solved all the issues