removed last change, included change from JSON format to list format in function