trying to make fixes