before changing figure
continuing with Azadeh s suggestions