Orginizational changes, unified call method to switch(caller)