Better split and memory management