some changes, additions