updated to lastest x-tag-core and updated control