modified stuff, added chombol db