Some changes. Does not break but does not work properly.