feature #8 seems to work