Changes to fit comp