changes merged for EPIC integration