updated to pull all info