Thanks Jarrod, keeps it clean :) Adjustment for #5