Refactoring to solve some issue due to conference presentation discordance