various changes to improve the slicing and keep them under 1k when possible