Changes for new layout and to have no limit for buffer sizes