merged master xtyle/