major changes applied to make character cases work