added promises and config
fixing conflict