Changes for the new requirement