Final cleanup done, this is the correct version