Changes in model to match white paper