Change in the core receiving part logic