updating with newLayout branch