Incorporate feedback from tschaub