- Revise for JMango use