Updated after input/clarification from instructor