vicky changes to char
merged changes