Finally fixed lines of code