Additional changes to fit comp