update to support MASON_DIR