updating returned data
adding final parsing and templates