Switch partially over to contourf plots