adding back some changes from the previous commit