mkay, Giacom's solution seems more elegant, dropping the faction-related changes

now this is only a feedback message-related PR.