Change things for specific figures, some functions broken