getting old concept working with new code (#294 #309)