Changed function input format