master
adjustments for new compile