Made WholeImage more modular.