change system and sort module