Updated with no-argument behaviour