using new layouts