UPDATED: WAK8 branch with latest changes