Added full simulation