changes to work with web service