change to new thor version
change to new thor version
bug fixes