added expand and contain