adding code from XO GRP comp