Added JMD stuff