New figures, fixed notation
trying to merge with Josef