Fix everything, problaby works now