streamlined even more