Restructured setup to be less flexible but much much easier