fixed merge! some things are commented out