updated for 6.00.1