SSW-3 fix

now the edit should more or less work !!!