changed some vars to str