Better joint mappings, switch to working (more or less) model.