reverting to old argument logic