more changes, still not ready...