more changes ... nearly there