Better solution for fold part stuff