added windowing