working on m and fig, updating