some time saving changes