more changes, not ready yet