New guides fix + DB