removed truncation
merge