WIP -- try to fix the max length