Updated the window package with properly parametrized functions