Added functionallyty for all calls + added numbers