refactored wafom
added comment to tvalue