Swtich to q promises