Improvement + debug.