updated for 4.8.0, builds clean