need to fix data and default comp