newer fixes