just some util changes