more construct change

no clue what to do next all up to you now