added windowHandler