Move Call into seperate function