merge with master
core code for new xcor block
ibroked it