some changes and features