Updates by Waagma-Sentry