Updated for 6.2, comments included for noted issues