added presentation and data