Added separation logic