added q14 and re-orginized structure