more changes to include tensortype
more changes to include tensortype