working on xepan final changes