added in Char awareness