some leftover changes