many-to-one for figures implemented 

basically to fix the bug with one-to-one