removed the flag, to put it in a seperate module