#686: Updates to SAWOL

Change request updated