Setup board WIP fix