added data, made some changes