Version with data and examples added
cleanup