rework head/body separation