making some changes and add new fixtures