changed to list-system and changed some methods