Revert "Revert "check comp but isn't correct""
Revert "Revert "check comp but isn't correct""

This reverts commit 4bad2adb72563d8e0e57ad188b289c54c1fc4e66.

Scriptor/pharen,Scriptor/pharen,girvo/pharen,girvo/pharen