more changes from prev.