changed everything to fit new params