Upgraded version. Used only for bare calls