updated for new clang