Added support for "peeking"