fixing eoors after merge. now runs