implement comments from Alex Schmah