Had to fix other stuff. close #1