changed to list
Merge branch 'master' of https://github.com/CarletonDevX/yofor