Finally added window changes