Updated to reflect the code changes