First draft with figures