Updated to reflect the new code