Updated from class

Set t in for loop to prevent problems in debug