Sid - changes for #21