merged @ageis comments