added data objects, updated controller