final version without secrets