Added new window based features.