#10 further improvements