Pre-release 3

Returned back all the input parameters for maximum retrocompatibility.