added option for generators (untested)