updated to reflect code changes