Some changes, because i can