Solved all bugs