added 'and' and 'or' to promise