#179: works
#179: polished