updated main & model (main,emp,js,pub)