Modified methods to be non-destructive