ticket:2 fix warnings
ticket:2 fix syntax error
ticket:3 merge with t2