started fixes