Added termination and area segregation