Added window and input