Migrating to WAK5

Migrating to WAK5