add question details, rearrange functions