updated to reflect recent changes