testing and modify