Added todo
Fix transaction on new blocks