Better JSPP logic