Updated calling behaviour.
Updated calling behaviour.