New version

Additional params, improvements in terms of usability