changes for experimental layout - not quite working