updated for 6.0