added some moxtra stuff
merge