sync with working paper and raphael
adding