Version 3, After luigi Comments #2

Signed-off-by: eldrichrebello <eldrich.rebello@aalto.fi>