Update Fritz and Joe's broken code to use MY api properly