updates to 3+4, 5 will come later...