final change from dawit

including archer database
2nd chnage from dawit

includes archer database change
test