added emppage
merged emppage branch