Altered based on Noel's initial feedback