synced parameters with jesse's version
synced parameters with jesse's version