Removed unused function
Fixed isFInished function