supressing window 2, some fixes