Added changes for Alex Furr API