Updated WindowApp