added data, tweaking