get rid of yellow and create includes