improved params :)