Fixing chart with the new requirements