Traces of B-32, B-64, C-32, C-64 added