another attempt at fixing relationships