Altered based on notes