changing to work with fig now