More changes, a lot of commented code if needed