better support for the pop state