stuff added by JMGalbur