A few small changes to make it more Tent-like