A good deal of cleaning done + timing inserted