latest changes + matlab figure