changed default paramaters a bit