some changes and add two new classes