in the middle---some bug in test
fix silly type-cast bug
redefining class
bugfix in cb
fix conflict