Add a few more params
Updated version