add resolve and confirm logic