tweaked API; improved response decoration