more features in system picture state handling