Added new parts to model for whitening.