adding changes for first pass