Updated window stuff