Update

Tweaks and using LINQ experssions.

Gotta test this.