Improved tracking of internal state considerably