Added Traumflug's suggestions