many changes, additions,getting it right