updated for RC6