Optional ensemble

Quick PR to reduce unneeded branches