updated for b95