Changes include logging stuff