APW - hopefully make install work.