reverting to pre-SXS to simplify code
rebuild