Changed the vars and ienumerable stuff