updated to reflect extended features commit