more changes, work still in progress