added data, and fixed method