move config into config block!