some changes under the hood