Fxied some logic, still not correct