fixing stuf still