Some changes, hasent fixed anything