Attempted overall fix