comment changes to be gone over at some point