Feature/kaa 141

Resumes Kaa's workflow