+ update to reflect recent changes