Not adding in an option to return PNG  as well?