Updated V1 to work with web service