updated with -current notes