fixed mistakes. Now acutally done