Changes made based on our meeting awhile ago...