Added a new boolean parameter to allow specifying when a call to