Updated snippet; minor improvements