Update containing some cleaning out in the DataWriter - Simplify FTW