Small changes for convenience