swithcing calls works pretty good now