Removed window, added arg checking.