Re-synched parameter boundaries with Jan