Some changes it is probably broke