Updated to reflect code changes