Added support for windowing