catchup to xs version