updated to not use proxy