MEDIUM / Fixed issues after fge refactoring / Work in progress