Some changes that shouldnt be here