#12 small changes