add jobs
serious refactoring
refresh some schema
simplify