update for object lay out system with samples

OK