some changes: