Incorporated stuff from curriculum