merged: new tool, refactoring s3 etc.