IsDirty - try to get it working - completely...