#12 some updates