Add args
Change arguments order, to is now optional