New Version with some extra parameters