Updated to match curriculum