updated to work with latest x-tag and added demo2