SFD-55

Update based on review comments.