Outputs for D16 also added. No plots yet.