minor changes under the hood