tweaked namespace usage.
updated version of pinkpill.