window arguments now consistent between functions