streamlined, added more shtuff