like changes, almost final